Manual revert of 4c2053e