Manual revert of c4770ca3