Revert "Merge branch 'weddings-and-functions' into features"

This reverts commit 9ec2c8683ffa87bba2d3a1696dd77f3c48ad2d33, reversing
changes made to 3f33ee775e0fe9dec475f5aebbe7b6743153bb7e.