Fixed ActiveSupport 2/3 madness