Restore public SystemContext & SystemBundle services