This reverts commit d8e18551c3. And partially reverts mapsize check. Only mapsize increases are relevant.
d8e18551c3