bug 846220 - back out 7359be50cc60e737d44ea0d0c0dff29fc2a1a95d