Revert "sync upstream"

This reverts commit f4f4fc2f87445c922ee9a4610ee5af18095bac27, reversing
changes made to cfa1f1e04f8ccf251cc9898216a89350d4a1bbdb.