This reverts commit 72844cd6156c37e73fd43eb1b3cecbbbff871eaa. Conflicts: setup/db/create-index-fk.sql