Revert "Merge branch 'odin' into feature/refactor-names"

This reverts commit 3de32684b4f8201c31319384617182e111a5c53d, reversing
changes made to 2d9323ba2b615a7077fba25981bf5c21fedc1454.