Revert Release Branch 1.7.18.1