It would be better to have a single binary for both the traditional interface and UHP (and eventually, maybe only UHP).