Comment 13 for bug 237995

Switching back to me as I am already working on it.