This reverts commit cb935f34. Discussion in D68708 advises that green dragon is being briskly refurbished, and it's good to have this patch up testing it.
