Manual revert of ad2a822ce5c3