This looks like a cherry-pick that was not needed; closing as dupe of BZ#1872885 *** This bug has been marked as a duplicate of bug 1872885 ***