This reverts commit e18dc50c. Fixes: 27807793 Change-Id: Ib0384e3deb8d6376265e8e60f14490de128c9b68 (cherry picked from commit eff3ca54)