Revert "Merge branch 'dev' into Clownfish"

This reverts commit 1071399d953e003e5e3d5bfb3763db4edad1c36f, reversing
changes made to 526299258e28468887cf63d69edf4c1bd6dab36c.
updated schema.rb