DynamicPath cleanup

Backout workaround for #602 which is no longer needed because the initial problem was fixed with #725