Revert af37372, fix conflicts