Bug 897729: Back out bug 723163 (a215de599e7f) due to it having caused bug 888839, a=lsblakk