Revert "Merge branch 'origin/fetch_test'"

This reverts commit 7dc204605d2887da043d214d350d9074685ca09e, reversing
changes made to 4b88c5b8670321cef6833c9d308626ad2a056e36.