Unreviewed, rolling out r215476.