This change will break Vagrant. Since we end up configuring things so late in the cycle (i.e.after multi-user-target is up), this will cause etcd to come up before it has a chance to be configured by the user.