Revert "Merging in from upstream"

This reverts commit 37e012cd3d47ef11c0430d4b98fb5e05b3a43cfa, reversing
changes made to 48f0c5aade9bb7ffccf178c8ec4cb0ec9343bfd2.