Revert merge commit e246010df7ea726d