Code that causes FORGE-928 is commented