revert: Fix for Location Services