MYLOC-83 - Revert change