Revert "Result handler change"

This reverts commit f4f4561a2832bb6733525657ef22807b62142d29.