o Partly reverted r746431 to restore backward-compat with plugins like Surefire that access this field directly for manual container lookups