Rejig the boot reenablement of location stuff, hopefully works now.