Partially reverts of f10f4604ddabb4d9fb19b82a68ec63d3e01b4993.