Revert "Headless Client"

This reverts commit f37dde6a321d0e60d49b8b1d3e69de7261bb5d93.