Revert "Merge pull request #472 from JoahG/organisations-fix"

This reverts commit 206f15978dee96945de96912e705da7b6daef2d2, reversing
changes made to 453307460310d8847146ef89d2fd24bac8cc2d4d.