This reverts commit dfb624e2. TSC request on 30.11 Change-Id: Ieb1e64d052c913b8aaedfe07620245054aa82a08