Revert "Function returning pair for single values"

This reverts commit 925d3e7af49434d0adfc8785dab10de37cad1f05.