FORGE-2041: Reverting changes