NEXUS-5749: Added Qualifier

And removed clumsy provider