Revert "Depend on methods again"

This reverts commit 14dffb54328d223d3e99c1751c41e14a29005dc0.