Bug from the 4.1 branch.