Revert "Fix TESB-8272"

This reverts commit 61264c824ecccbf8d227c6fadb255bf807489a75.