Merge change 21796 into eclair

* changes:
  Turn down RegisterMap paranoia.