Fix merge problem due to removal of daemonCoreSockAdapter in 8.3.