Revert "Spaces in Path BUG"

This reverts commit d82d9f2dbd88e1e93a97c82dd1d82c815be65251.