This seems to have combined badly with the systemd upgrade, we'll revert for now and revisit after the 14.04 branch. This reverts commit ad805328, reversing changes made to 1c5d3c78.
