As discussed offline, now handlers are initialized lazily adding a mapping shouldn't start binding its handler eagerly.

Probably amounts to removing

Blocked by #3899