Revert r75252 which was causing some crashes at compile time.