Partially reverts 5708345.