Revert "Update from upstream/v0.2"

This reverts commit d2022fa6f7bfb55006ca1f89fd0d0e4cbea80e60.