Revert "Fix import of InternalGroup" The fix is not required and not compatible with stable-3.4. This reverts commit 1bb081570abc11158f03934583df206e4636c8ce. Change-Id: Id4115dde2904cb12864f55264625ef18c585bf73