Revert "Merge pull request #12892 from comoyo/value_selector_inputcontext"

This reverts commit 47c3ccfc7682d7caeeb8a921153caf8cefc5b480.