keep up with 1.8 branch Classic changes