Build change to support fix to WP-1810