This reverts commit 6e27b7de8b. Closes-bug: #1773999 Change-Id: Ibf3c4852eab366eaf1a7c10ee8a4453a15a352a6
6e27b7de8b