Revert "Merge branch 'kittee-ct_appconfig_fix'"

This reverts commit 3c0f420c2a547cdb4f49348f19421513cf3a250e, reversing
changes made to 8f64e131846d53dbf8516f86270402465b7b37f8.