Unreviewed, rolling out r150386 and r150397.