Revert UW to 456f100b8b6fdf33e3206fb9538e8b6e932fdfd4

Change-Id: I9a7e97973cdf38ecc3f29c10dd3111d8c8f48e7a