Restore working Rails 4 branch