convert it from a template to a concrete class, since we only have one
use-site for it anyway

Change-Id: I7209243cc744c7ddb727d6136795d8628b91ff6f