Revert "WELD-1657 Backport WELD-1452"

This reverts commit 3174f4227c89802ae6724fb2052360cee3cb87c6.