Revert "Fix for U4-5332"

This reverts commit 21398a078a7b5302d603b981a465281a8eecb8f9.