Revert "Fix my derp"

This reverts commit a1ef9bd4d27bdb07ab71fd66815b48a13fb6ecbc.

Change-Id: I0786f40b536cbb42cd844405251618a8b3ee5601