Revert the changes for Bug#3990 on the 1.3.5 branch; they were mistakenly
merged there.