This reverts commit 5cbeb5902633646fbc0a1be252081e77aaaee7b4. Change-Id: Id96010364d65e6131221ebbcc8ce5889a2da256c