Revert "Fix code paths not returning value."

This reverts commit b52e4de0761a7a35ba406238fb401122c3e66b4d.