I am going to land this commit on master and then merge it into the maps branch where I will address this.