Revert "Fix TESB-8272"

This reverts commit a2ea4b7d910a2a55f8ca973559e3d39b03de7d33.