Unreviewed, rolling out r149349 and r149354.