CON-459 | Revert: Global navigation datasource change