site-specific patch to solve WP bug #23221