Comment 14 for bug 1382977

Created attachment 5715
Guido's patch

This is Guido's patch in a git am-able format.