Fix derp round 2

Change-Id: I942f55d22bf2901ca1190b8a711268bb57b80350