Comment 6 for bug 723994

I have not compiled nor tested this yet.