This reverts commit 1f0a12ee8d. Systemd build was broken and such change should probably go through staging anyway.
1f0a12ee8d