We have a hack for a bug in 2.9.2 and earlier, we should remove it. This will also allow for some code cleanup.