Comments out backported code - need to wait till we merge in the custom membership branch.