Revert "Refactored return parameter."

This reverts commit cc39f4637a24b58c3d67574d91a56a8043cfb8d5.