hacky workaround

Change-Id: I122b613c0c2b613f7cb97563e39640ff28389715