Revert "ohk" because it breaks a lot of other things like promoting

This reverts commit da78779d225837c83f0aa9a987d18fad5c9f0566.