Revert r46073. It caused corlib_test.dll compilation to fail.