Unreviewed, rolling out r238844, r238846, and r238874.