WP-1121: Remove duplicate APIs