cherry picked 8ff6166610. Fixes the quote problem in PATH