Revert SVN #32360 until Windows compilation errors corrected.