Updating to not require ancient version of activesupport