Revert "contract"

This reverts commit 7355754a1bd126440d8cdf01ab68484f5d081a80.
Revert "Revert "contract""

This reverts commit 0f27134209c06dd5d55d90ca71cf57d8bb55ca36.