Allowing return local-only variants [ci skip]