Revert brians patch to get mapping info working again