Please add a comment here relating to this issue, and indicating what version of what project we can drop this compat hack in.