Merge change 402 into donut

* changes:
  remove seemingly now unnecessary workaround path