Revert some fixes that broke game capture