Revert Release Branch 1.7.17.1