Backing out 3031346b1104 (bug 1050447) for not fixing the bug at all.