Reverting a few of the derps

Change-Id: I0a12b52a3a1310a8c467fca071852858bf60e003