Revert commits 5685 to 5688 committed by mistake