Comment 12 for bug 1788907

Since fixing the problem was pretty much as simple as squashing reverts, I've proposed https://review.openstack.org/#/c/596467 which fixes the bug (scenario003 has already passed on it, although it's waiting on some other jobs ATM). That will also need to be backported to Rocky, but once that is done this should be resolved.