Revert "Merge to upstream r304942."

This reverts commit 83b1388ecd, reversing
changes made to f20819f925.

Test: treehugger
Bug: None

test/support/variant_test_helpers.hpp

@@ -69,9 +69,9 @@ template <class Variant>
 void makeEmpty(Variant& v) {
     Variant v2(std::in_place_type<MakeEmptyT>);
     try {
-        v = std::move(v2);
+        v = v2;
         assert(false);
-    } catch (...) {
+    }  catch (...) {
         assert(v.valueless_by_exception());
     }
 }