Revert r240302 ("Bring r240130 back.").