Additionally, this reverses an if to remove an indentation level for
the good code.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>