Unreviewed, reverting r267403.