Feature [#39518117] Re-add company switcher

Removes unneeded modification to company decorator.