Revert change for Bug#3983 from 1.3.5 branch; it was mistakenly merged there.