This change is not irreversible.
Merge pull request #73 from opf/feature/rails3_migration-fix

This change is not irreversible.