Same as prior to change: System or SystemGroup, etc.