am 96a98d6: Merge change 402 into donut

Merge commit '96a98d61d7a8360e7a70c91281a9d608837a6056'

* commit '96a98d61d7a8360e7a70c91281a9d608837a6056':
  remove seemingly now unnecessary workaround path