Unreviewed, rolling out r144726.