This reverts commit 11894782. cc @edolstra, re-reverting. Looks like it's an intended systemd change.