Revert r59730 for now. Has some warnings and might be causing a weird regression...