Revert "Fetched from Upstream"

This reverts commit 13707711d0047c571af891d496d8a1272e314c5d.