This reverts commit fd3156bc60. Closes-Bug: #1802083 Change-Id: I7705744cab62f432e2e09bf1ee88bba809609cda
fd3156bc60