Revert "Cherry picked commits from the grouper kernel"

This reverts commit 77c637ef74fa95892873aeafbb1bb47c75ad6437.