### Description
Proposed fix of #1924
### Backward compatibility
_Are these changes backward compatible?_
Yes
_Are there any infrastructure implications, e.g. changes that would
prohibit deploying older commits using this infra tooling?_
None
### Testing
_What kind of testing have these changes undergone?_
Manual
---------
Co-authored-by: Trevor Porter <trkporter@ucdavis.edu>
Co-authored-by: Nam Chu Hoai <nambrot@googlemail.com>