Uncomment what I thought was useless. Maybe not so much?

Change-Id: Ibbc9244e04af5f806ed0f6fd93a9fe7c04441bde