Revert Rails 4 specific changes I mistakenly included in previous commits to master branch