Revert "Update to upstream latest"

This reverts commit f78cfe0d0fcf8442cbc80cda81366097340c89f6.