bug 833524 - back out f3c2cc8dc47d.