Fixes #6017: Don't trigger de deployment check in the obvious case where it should not be deployed