Revert hack change from "Merge pull request #7151 from SvenDowideit/add-version-selection-ux"

This reverts commit 2f23e204d9190895ae761d97495fdbd7093b625a, reversing
changes made to a491d204a0e38f8e42d1f2edfd6e08bc0cd61a50.

Sven merged when this still needs more discussion and review first.