Forward port of issue #36095 to 3.2.x.

Comment From: wilkinsona

Already addressed when removing API that was deprecated and due for removal in 3.2.