This reverts commit 66e21a05577fb4ed1ec457a1e771fc80b168f0d1. Change-Id: Id28c2ec13366e3129b9775df9922b03c8c85b4fb