Remove hgroup as per bug 22090