Partial commit 2 for the Rails 4 migration. #740