Revert "Functions v2"

This reverts commit 003527605ad6d1be2d6b9fa4f939e2d3eed5eafa.