Revert "A few more config changes"
Revert "A few more config changes"

This reverts commit 61c1e59ba8e5387278b66833f9f2bfdda8dc1c77.

CMP-Studio/cmoa-app-cms,CMP-Studio/cmoa-app-cms,CMP-Studio/cmoa-app-cms