Note if this becomes a bigger issue, the relevant parts of bug #1904036 could be extracted for use by this bug.
Note if this becomes a bigger issue, the relevant parts of bug #1904036 could be extracted for use by this bug.