Patch that removes the previous corrections and apply the new code to the trunk (created with revision 11998).
Patch that removes the previous corrections and apply the new code to the trunk (created with revision 11998).