Back out --with-good-getgrouplist patch