Unreviewed, reverting r269043.