Rever the changes, because it may conflict with Paul's fix for 3.7