Comment 20 for bug 197781

Comment on attachment 303723
Unbitrotted WIP patch v0.3

Okay, going for reviews then...