Reverting changes to project files that would have enabled XInput by default (with paths specific to my machine).
Merging gameplay.sln