io7 hotfixes is not needed anymore

Change-Id: I0c2a51a2a4f74574d69010edbcb5d1b3088cd043