Revert "Merge pull request #417 from miken32/cp-database-fix"

It breaks customizations, it's not a good time for such big change.

This reverts commit 40c7b1a98bfdc61261154adaac5fdefc234ecb08, reversing
changes made to d896f86751bae79625197da6c80d709fdf185448.