Revert "ROMControl: NavBar Optimizations"

This reverts commit 4d5581132e387dfd33c768e211e14cf4f3f85eec.