Revert "Various config changes"

This reverts commit 149e1269a12100a7625ae9c4d0b76fac9688c7b1.
Revert "Added XACT"

This reverts commit a78bcb51525f69fcd54fc6e94d62ed455c747d4d.