be parsed as option. Restore behaviour broken by previous commit. Mirrors second part of patch from lib/17248.