Now it's not ever so slightly different in height from other ones. (cherry picked from commit 7fa4ccc7)