Last code derp I promise after swipe patch

Change-Id: Ibe45ff6ae3e3b56d2fc2c4086d570a652ea9f2e4