Derp Fix v2?

Change-Id: I0bb95d3fa22c729b0255372d878ca444dad734e6