DM-31458 had one unexpected consequence - it broke ap_verify in gen2 mode. The reason is that Apdb is trying to use polymorphic config object and that config is stored in Butler, but gen2 Butler does not support polymorphic pex_config types. One option that I like most for is to add support for polymophism to gen2 Butler similarly to how it is done in gen3 formatters.