This reverts commit 0ec2bf39ef. Change-Id: I6e02b2bc15ccda8039850fc5827b3b5e4323e679 Closes-Bug: #1713926
0ec2bf39ef