c1905: remove unneeded hacks

not needed anymore

Change-Id: I78e916c8d4c542ac2ebc7483909c2e58bd588e1d