May you also add the comments from original bug 830644? Because the 'padding-bottom' is somewhat hacky way and I think it's better to leave the comment there