Try fixing derps

Change-Id: I4af451952d419bce78e9e03a5b6bfd281a4e0471