Revert "Commit db change, but will try revert later on"

This reverts commit 1081e6e869a1402540763f3b7732628095d9cdb6.