2 Days Ago
Cherrypicked fireflickerfix.