Bug 694796 now respecting PEP 8