Revert r100056. It was causing a failure on MSVC.