Merge "Don't special case Grenade + systemd"