First draft of no-pa-before-config changes.