Bug 983420

Clobber the content of *_PATH_ELEMENT, no need to remove it.
Merge pull request #3062 from BanzaiMan/dev/hasari/bz983420

Merged by openshift-bot