Revert "Merge branch 'sfinae'"

This reverts commit a593879d237d3fb08572b1d23385b8bf895ae8e4, reversing
changes made to d575761eada1eb91b33532b2cdd080357f5787d8.