This reverts commit aea5cc69c39eaa4460fd9d8cf0571d6c76c547ad.
Part of coop-cloud/organising#226.
Closes coop-cloud/organising#226.