This fixes bug 269638, so lets stabilize it.
*** This bug has been marked as a duplicate of bug 322867 ***