Even if we could use the htp_config_flags approach lets do it post-merge.