Revert "More Metaclub changes"

This reverts commit 85bbe526401b5f1a7c80b957aad6d9fe64725c7e.