Backout changeset 000ed86d069f (bug 861117) which caused bug 871560. a=lsblakk