Revert "Merged schema.rb"

The migration that produced this change was in a branch and is unlikely to be merged into master

This reverts commit 90ec40586932f363baca66ac3b946448a7e395d5.
Merge branch 'master' into staging