Update for v0.11.10 support

This reverts commit 68b18e443727cdd2ae70fc87b9dd076a2829c973.