CB-7375: Partial revert to resolve WP8 failures