[Bug 31549] Commit c2c55547dc36f404e29dbc9253166f90df6783af makes CS checker unhappy and causes rendering issues