Partially Revert "Workaround GCC bug PR78489 - SFINAE order is not respected."

This partially reverts commit r328261. The GCC bug has been fixed in
trunk and has never existed in a released version. Therefore the changes
to variant are unneeded.

However, the additional tests have been left in place.

llvm-svn: 328388