This reverts commit 9a5059d440. Reason for revert: let's use UC Change-Id: Ifa2c455a0ac5d239cbd7de329521474b366b3c76
9a5059d440