We'll still have to support 1.8.x for some time, which means we'd have to carry two code paths anyway. I'd really rather only use one version of the code, and it's only used in one place anyway.