Revert "group updates"

This reverts commit e528fd8f35a55894812cc8d62771dd5d01e624e6.