Revert "Again we track own RomControl"

This reverts commit 6824ce89270235b0a0a995004ae946088c2c4e88.