Co-authored-by: Yann Bertrand <5855339+yannbertrand@users.noreply.github.com>
This reverts commit 03d96f8adf.
03d96f8adf