Revert "Just cant get rid of this"

This reverts commit 97dc5ade158775c87d6e0e22e990de0def559cf1.
Dumb Ass

Change-Id: Ifc81cdeffabcdb09e939a1ec3dc67d59ac867b5b