Revert "Get up to date with forged"

This reverts commit 3b9dad76d87b41465ade0dffa7ee0433076c7a52.