[forge-commits] [forge/core] 82864f: FORGE-2041: Reverting changes