Revert "Initial fix for FORGE-1488"

This reverts commit e9a9710cde98df96bcb5c4e92a8b714087db60e7.
Final development of FORGE-1488