Unreviewed, reverting r294238.