WP-2232: change markup.