Unreviewed, reverting r277614.