Revert "Merge branch 'input-management'"

This reverts commit c833307fc81fdb5257ce8f895541e5c6c8a28f93, reversing
changes made to 7f2289c35f0a6c32ef977361c5329527c60bd22e.