Merge pull request #2398 from JosJuice/revert-854f6b8 Attempt at fixing issue 8544 (input recording desyncs)
