Reverting incorrect fix for FORGE-1101

This reverts commit eb70e18050e742137daf45fa57601318b25125d4.

This apparently relies on FORGE-1098 for a complete solution.