am 6082880a: am 13a75ecb: Re-introduce workaround for issue 3090362

* commit '6082880a0e71b01f14b4606cdbe9b9311014e450':
  Re-introduce workaround for issue 3090362