Another change from the original 3.3.3 diff