Revert "Update for 1.7.9"

This reverts commit 664d936e0cf2b882117068316f0a244e8af4b12f.