Revert "Ditch the systemd workaround build for now"
    
    This reverts commit e23df39ee13f18dec0c90c12aaae39f83e49e2fa,
    putting the systemd workaround back in place, now we know how to
    avoid the bug it causes. It's going stable tomorrow anyway, but
    I want to re-run failed tests with the fix right away. Used the
    update ID this time, not the build number.