WP-2612: apply to new markup.