Comment # 9 on bug 56663 from Ilija Hadzic

Just uploaded to https://bugs.freedesktop.org/show_bug.cgi?id=56680

Which should fix the Zaphod mode problem without breaking non-Zaphod mode.
Sorry about the goof.