Revert "Update to 3.1.16"

This reverts commit 58302261f40cd18386a988faefbb49191f87382c.