Revert "upstream changes broke UKSM, so dropping it untill updated version is available"

This reverts commit bce0b29f8dc186b4d31d364c6b682d18b8151d60.