Issue #2073309 by bojanz: Move to chosen 2.x