Remove version dependency on client_side_validations