This reverts commit 4a4ff70ab2eaadf6ff2673db7a2454d54526d451. Change-Id: I27cd5204cc25e664b2722815f9efcfa0fde6b48b