Dup of bug #2161843.