Revert "Fix for Location Services"

This reverts commit c329ef4873eb4f0da483cd0a492bc4bd507d6665.