Just cant get rid of this

Change-Id: I933bf271f72be96364403d09e9f2eb0701f7a006