Revert "backports: use updated 3.10 branch"

This reverts commit 87fc443b81c2a250c72740bf2c98320f0bde7acd.