This reverts commit 86e0bcc264. Reason: This caused some issues like too much GPU usages. Updates #2961 Closes #3003
86e0bcc264