Revert "Trying to resolve schema.rb headaches"

This reverts commit 0ae0d4d2baf65143f1038b59c1796077b59646aa.