Fixed my fix to really only use defaults when getCurrentPosition fails
DRYing up my previous change
Merging changes from Josh