Revert "More hybrid value changes"

This reverts commit f7dd593c6873ab4f9ab5695d6e180c870aaa9406.