We can backport that if you want. Look at the monkey patches directory.