[#2080] revert one of the changes in the previous merge. The 4.0.0 change was added in the 4.0.0 code but not in the 3.3.1 code. So it should have been kept.