Revert "Removed SFINAE so that error messages point to the right place"

This reverts commit 545d61a3977b64750b35b532445102bed36df1c8.