Revert commits c2b1558, ec6b861 and a99a021