Check-in the rest of 3.9.3 source for real this time