fix/regression-2122
master
Walked through the diff and noticed some config flags that have been disabled unintentionally. Restore them. Fixes: 752476dc8f
752476dc8f