Index: include/type_traits
===================================================================
--- include/type_traits
+++ include/type_traits
@@ -1294,17 +1294,20 @@
 
 namespace __is_convertible_imp
 {
-template <class _Tp> void  __test_convert(_Tp);
+template <class _To>
+struct _Dst
+{
+    _Dst(_To);
+};
 
-template <class _From, class _To, class = void>
-struct __is_convertible_test : public false_type {};
+template <size_t> struct __one { typedef char type; };
+template <class _From, class _To> typename __one<sizeof(_Dst<_To>(declval<_From>()))>::type __test(int);
+template <class _From, class _To> __two __test(...);
 
 template <class _From, class _To>
-struct __is_convertible_test<_From, _To,
-    decltype(__test_convert<_To>(_VSTD::declval<_From>()))> : public true_type
-{};
+struct __is_convertible_test
+    : public integral_constant<bool, sizeof(__test<_From, _To>(0)) == 1> {};
 
-template <class _Tp> __two __test(...);
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 template <class _Tp> _Tp&& __source();
 #else
Index: test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
===================================================================
--- test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
+++ test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
@@ -52,6 +52,12 @@
   NonCopyable(NonCopyable&);
 };
 
+class ForwardClass;
+template <typename T> class ForwardWrapper {
+  const T value;
+};
+typedef ForwardWrapper<ForwardClass> Forward;
+
 int main()
 {
     // void
@@ -200,10 +206,11 @@
     static_assert((std::is_convertible<volatile NonCopyable&, const volatile NonCopyable&>::value), "");
     static_assert((std::is_convertible<const volatile NonCopyable&, const volatile NonCopyable&>::value), "");
     static_assert((!std::is_convertible<const NonCopyable&, NonCopyable&>::value), "");
-// This test requires Access control SFINAE which we only have in C++11 or when
-// we are using the compiler builtin for is_convertible.
-#if __cplusplus >= 201103L || !defined(_LIBCPP_USE_IS_CONVERTIBLE_FALLBACK)
+// This test requires Access control SFINAE which we only have in C++11
+#if __cplusplus >= 201103L
     test_is_not_convertible<NonCopyable&, NonCopyable>();
 #endif
 
+    // Forward
+    static_assert((std::is_convertible<Forward*, Forward*>::value), "");
 }