Revert "fix display of extra options"

This reverts commit fa1e78b541888e3bdcf80b92254cec8991d96f8e.
"fix display of extra options"

This reverts commit 16a80087f0f2606cd1d4a75ea6710df144a1c3ce.