Backport of clearfix