This reverts commit 3ff2325f. TSC request on 30.11 Change-Id: I67469ab5f9253bbb5ab5db61e45ffd74ca4858eb