Backout 8a6cacf047a1 (bug 833795) to fix bug 856083