Removed workaround for Sun compiler as it does not fix the problem with the compiler and template introspection.