Speculatively revert r97011, "Re-apply 96540 and 96556 with fixes.", again in