This change isn't related to adding location support, please submit separately.