CoreWM: Revert some code