Fix a regression caused by recent refactoring.
Authored by: david_costanzo 2020-12-24
Parent: [r5562]
Child: [r5564]