Revert "Merge pull request #13027 from akshay-vishnoi/f-refactor"
This reverts commit f4a5a9e, reversing
changes made to 7ccb482.
The logic is different, the first call to #option_value_selected? is for
the :selected option (the argument is the "selected" variable), the second
call is for the :disabled option (the argument is the "disabled" variable).