Revert to the 1.1 default behaviour for PATH updates, and add an option

Ref. discussion at #1699