Pulling in a change from Parker Norton that fixes an issue he was having...

... with the upload workspce not working right, all tests pass still.