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

This reverts commit 0266b394330c15a82af578431a30f7eddfaba3c9.