Revert "0.16 -> 0.17"

This reverts commit 43f8c7dfc2337935d8fbf3776db231da6ed9ad06.
Revert "Revert "0.16 -> 0.17""

This reverts commit 946c40673bb5baa243c5952107321eee229b2f3a.