Revert "Revert to upstream"

This reverts commit 430a04c8226677be7be58b5d411094d374a62b19.
Revert to upstream