Revert "Merge pull request #20353 from timdream/input-switch-flash"

This reverts commit c0d1670ba57666210a7e7fd021ca4d9b47ab990c, reversing
changes made to 56812bb7f5234088d6802361190411cdab796868.
Merge pull request #21167 from mnjul/bug_1016283_backout_due_to_bug_1031505

Revert "Merge pull request #20353 from timdream/input-switch-flash"