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

This reverts commit 4fb5a545dc2dc6d89e6f912f787e019a770d907c, reversing
changes made to fa366f051e657d49406dfebc433ccd69ea62353d.