Backed out changeset c198907c6ba6 (bug 909779)