Poor 1.8. If only more of 1.9 were back-ported into it...