Revert "alternative approach to fixing GetValue() bug"

This reverts commit 3f5823cb9f1fc328a6dba50d7653adb3f134a993.