Re-add different workaround for same plumbum bug.

The removal was a mistake; however, the new code is less repetitious
than the old code.