Revert "Merge remote-tracking branch 'github/3.9/uksm' into 3.9/master"

This reverts commit c3c77768e5ac5fb654d3db5df03042a83e8d2433, reversing
changes made to bc3ae33f62ff8336e9b18f7c90af160452bbfd66.

Doesn't build.