am 13a75ecb: Re-introduce workaround for issue 3090362

* commit '13a75ecbb8d8f6b4658dff832133d0fba574d62f':
  Re-introduce workaround for issue 3090362