True - but as long as I need to backport these bug fixes to oc5, I want the change to be kept as little as possible