Comment 1 for bug 1983269

See: https://review.opendev.org/q/topic:bug%252F1970888

Affects master, 1.7, 1.6 (which hasn't yet merged at the time of submitting this report).

Will do reverts and then the functionality will need to be reverted.