This patch fixes a return code that was mangled during a hand-merging of
some code changes.