4.4.4 probably break stuff

Change-Id: Icca4c20e976c7dec5e4575a77e144a4b4062e589