Backed out changeset 9a796d86bae8 (bug 1063728) until people agree what they want to do here