Revert fe7c633e4cd38ce081edf222e9a0d036294cd699 after 69221ba2b410f3965cb627253149bfdb1f49f817.