This fix is incorrect since "--" was already stripped out of extraArgs. This reverts commit 9092b59a.