am e63f6f7c: (-s ours) DO NOT MERGE: Remove obsolete "headless" support

* commit 'e63f6f7c8d0094bdea3fe031a178490b273162cd':
  DO NOT MERGE: Remove obsolete "headless" support