Bug 19436: (QA follow-up) Revert change in _handle_one_result