Revert "OCD..ification"

This reverts commit 443361a0101151beecb4b7e402702482e72ff8a9.