Cherry-picking @ascott1's css fix