Change to build to support fix to WP-1810