Revert to pivot mapper