Reverted Forge changes.