Backport: Improve clearfix