Revert [d5f6b064eb] as it causes more harm on simple validation/usage exits