Maintain start/stop behaviour compatible with previous version.