This reverts commit 8291d416.

Un-revert that, with a tweak: with the bizarre name lookup semantics
in C++, the proper way to refer to a template (as opposed to a template
instance) is by prefixing the name with its namespace, which does seem
to work with MSVC2008 & GCC 4.7; thanks to Stephan Bergmann for the hint.

Change-Id: Id9cccbe68fb3ce2dd070c4b3dbd21782c92170ca