Revert "StatusGroup fix"

This reverts commit 996bafc6bf66067dfdd1beca1a1583193f556da0.