It's easy to forget --headless before --convert-to, and it's hard to
image that would be intentional ever.

Change-Id: I18b85837239d9450743f05d94bb2673c7d13246d