database changes (reverted from commit 70ff27344cd25796e6392d8e89977810ca6cc72e)