Revert "Fix for Location Services"

This reverts commit ac64ea00700e4d1e3d5d552e3c2a504a766e5a80.