I added a TODO comment. I think it is not worth the effort changing the code when support for 2.9 is declined once 2.1.0-final is released (is it?), which isn't far away anymore.