Revert "Possible fix for discussions/400284"

This reverts commit f36f65aeb3ad3e7e4b2cfa99dabbc421b947d708.