Revert 'membership type' devel changes to pass tests (DB is not updated yet).