Revert extent mapping patch to committed v1, add followup patch