Still keep the non-socket activation code around for starting from the commandline, but will likely drop that too in the future.