Unreviewed, reverting r277346.