Commit Ken's changes for Rails 4.