WP-3420: change how borders are applied.