Hacky fix around mistery issue

Change-Id: I4daa29fb6bdb45c227354bfd23f50286d06d83e0