r16674: After removing each individual post-3.0.23rc3 change: