Derp Fix v1.3743625

Change-Id: Ic7113db24ad544308eea20a830291144d61cbf56