Fix Tim's OCD

Change-Id: Ibbe385311a1d318117d681f38288a79f78e6cab1