Revert "corrected database settings merge again"
Revert "corrected database settings merge again"

This reverts commit 8d04d1c731aaed33c586993002f5e713c3fa1408.

jeffh/YACS,jeffh/YACS,JGrippo/YACS,JGrippo/YACS,JGrippo/YACS,JGrippo/YACS,jeffh/YACS,jeffh/YACS