Revert "Merged changes from upstream"

This reverts commit 59f68c4ad52f3919fa62cb88b8221e885bc50838.