IMHO, you should delete all changes except this one, and wait for them to bubble up from 2.4. If can't wait, well, tell me and I'll merge it now.