Unreviewed, revert r294214 partially