This isn't quite right and broke on stable/liberty. Pushing
a revert in case I3c22d77dece399d21ab94783b74990789a1e1481
doesn't actually fix the problem. We should probably merge
whichever passes first.
This reverts commit 69653318f4ebcff37a463db213ba131d8196778e.
Change-Id: I9304429f25d28ca756e50b1788e149c5bb46b1d6