Revert "Merge branch 'DataBaseManagement' in 'master'"

This reverts commit 4d671cae262a1f0685c70f4364a297979b7d74c4, reversing
changes made to 48d87c805bcac40cf5c50195d5b8fe1955ae8afe.