Revert r235451 since it is attached to a wrong Differential Revision. Sorry.