Revert commit beb4085