6 Months Ago
Cherrypicked fireflickerfix.