Revert last commit "Temporarily reactivate the deface hack to load overrides"

This reverts commit 103088569bc1986f32ab33351b11583f9a2f7e4a.