Revert "Fix derp"

This reverts commit 6165ea190a1e60a544d14c15bdfe94f8a58472f9.

Change-Id: I34a33cca1eac2f5016c923fb39006e7b06876cd8
Merge "Revert "Fix derp"" into pac-4.4