Backed out c4c490f3b301, previous backout of bug 900551, bug 1011518, bug 846200, now fixed by bug 1055898 (51afb4de4a25)