Revert "Fix for issue FLEX-34320"

This reverts commit 798194db5eaf9aa28db4fd6027f78b40bb15800d.