Comment 1 for bug 981248

Removed patches as they are incorrect. I will upload a fixed set of patches shortly.