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