Unreviewed, rolling out r150034.