Hack around yet another template problem.

Change-Id: Icee3e829b9f13f82536beaa9e7da6ae3cbc023ab
Merge "Hack around yet another template problem."