Comment 23 for bug 1085

Created attachment 200039
Revised from last patch