This reverts commit 61c6bd5ace.
61c6bd5ace
Closes #33544 Signed-off-by: Bruno Oliveira da Silva <bruno@abstractj.com>