These files had a consistent style before, let's keep them that way.

Change-Id: I8a05a8fbbc193373e0815f27d2cd9ff1272ba0eb