LPS-39348 Rollback because it breaks control panel links. We will rethink this for a better solution.