Revert only temporarily because this breaks something in Rails 4 involing Array.  Figure out for 1.7.17