Revert "Merge branch 'master' into DBMigration"

This reverts commit 427e644961dcdd46ee87d3c49934cdd835d818ca, reversing
changes made to 4b58e99f217601c796bdaf1fb36b3bc80c236ceb.