Revert accidentally removed code Change-Id: I2e3ef0168e403427efa126390bf5375564fc0628 Closes-Bug: #1519835