Revert "Bug fix CVS is fixed"

This reverts commit 6e20a262019b6c3202df2bba7269a8eeb17efad1.
Revert "Own config"

This reverts commit f7ed3ab079da2861dfb1b48e4c81bf681d79c383.