d588c26cf6
This reverts commit 8debaa34d9.
Seems to be a few regressions, namely XBox Controller Rumble, other
controllers not detecting, etc.