Stop setting deprecated config options

(cherry picked from commit 0bfa978e2834cef7f9832112e6a640b3543711b9)