Back out Base curation changes between 1.6.1 & 1.7

These changes have been found to cause looping when curating Groups in
The Mint