Issue #3587024: Revert commit 28d23924

[Description of changes] Revert commit 28d23924

Testing instructions

  • First step for someone to test the changes in this MR

Closes #3587024

Merge request reports

Loading