Temporarily revert r93581. It was causing failures in the ExecutionEngine tests