Back out unreviewed commit 17d23282dd6d8b1bf6b1b80f97cf02265cbec59d