Revert "Merge with upstream"

This reverts commit 3db931b85d171b27ea8f3cbbf8e702e1c55fb4ec.