Backed out changeset b4e326ab6782

Makes Windows and Unix behaviour consistent.