Revert "1.5.17"

This reverts commit f6e094cc10443c734632bd89ecefd0767a953f35.