Removed a custom check for an in-house implementation