Revert: "Put geofence support under define"