Revert part of d35d347

That part of the original patch should not have been committed.