[forge-commits] [forge/core] 632dd9: Reverting incorrect fix for FORGE-1101