backouted commits daa9f8c161, 7273244992, 478299b161