Merging to make sure we get clean test data. If systemd-based systems become used again, it will be time to fix the speed issue.