Revert "Merge pull request #3445 from Alex-Code/getValue"

This reverts commit a5846fa26983c53b9e98f10902e648140c322164, reversing
changes made to 2a6e064acadc1e80a083cbc86e3182920662bbe5.