refactoring
consistently support old ActiveSupport