backout Bug 869936 which relies on bug 830347.
merge