Comment 21 for bug 322314

I submitted a patch to upstream to remove the startup option, as per comment 9 and 11.