Revert "Merge Upstream"

This reverts commit 591e1fb2196c799b941b68b51bf7d5c4dfb707c4, reversing
changes made to 5e13b97e351b9d023830c8acb011213f3903c160.