The alternative is fixing the patch itself which fixes both problems without any loss of functionality from lucid->maverick but the functionality will be gone in natty. I was advised that reverting would be prefered, but in case its not a refreshed patch follows.