Restore the ordering of the help output to what is was before the restru...

#build and merge please