WP-2951: change implementation to fix wrap, float, change classes used.