Revert c843149 that causes artifact in non-buffered rendering mode in some games

 Issue #2618