Revert "add back adm navigation hack that was still needed"

This reverts commit a32c655b60b4e9a324bc18d0cf8d9058287daeef.