Referenced https://gitlab.com/gitlab-org/gitlab-ee/issues/11539
so we can find a more long term solution

Added a second feature flag check so any performance penalty isn't
hit by default