This is a manual revert of 111461aaae. git revert does the wrong thing because that patch shares lines (that we want to keep) with 168667c972 and git revert just removes them. Change-Id: I83ac8c95e5c90a4137b7742a9b7536e1627f1ac7
111461aaae
168667c972
e5477f83
d5e1c583