Revert "9.17.1"

This reverts commit adf974c7e61451d028057f8909b56fc97213e04f.