Revert "Attempt to fix Rails 4.1 error"

This reverts commit 7e1dfdaa8926447538652cd4849a802f34004e50.