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

This reverts commit 2efd738d5890e54fa9dd80fa900892605504108d.