Comment 45 for bug 1121874

I removed the bzr branches related to the previous change that caused the earlier regression.

I also have included updated debdiffs with a more readable solution.