WP-3862-2 Experimenting with fix for build error.