(Bug 110) Initial import of old backend patch