Revert "More input cleanup" (cleaned up too much)

This reverts commit beb35d486dc774bd1883b2d956c915ff8431ff53.
Merge branch 'master' into gameplay