Unreviewed. Rolling out an unindented change from r143580.