I though Scott had recently merged this but it seems not.  We'll be
needing this patch if you merge Manfred's page unmapping debug patch.