Does this fix the problem with demos? (For you or for anyone else reading this thread.)

I don't think I brought my only controller with me when I moved, so it would take some legwork to test this myself, but it looks plausible without any testing...