Unreviewed, reverting r259446.