Unreviewed, reverting r275633.