Revert Matt's fix for dev/membership#24 as it is incomplete and add a unit test in...