Unreviewed, rolling out r150425.