and there comes the mandatory 1.8 compat fix