This reverts commit bc43d5ba5c6b329f39b2ab89256c381e3ca677f6. Conflicts: setup/db/db/schema-228to229.sql