[us-commits] [ehb54/ultrascan3] 26b3af: These MINOR changes are killing me