Revert "Change form"

This reverts commit 5af602cd4ec78d415ba0cefdd85dd2021234ec17.