revert change in unrelated code of previous commit (todo: is the + '' necessary and I forgot to insert it in the template; or is it unneccessary and I did not bother removing in in the non-template version, because the next template conversion would remove it automatically?)

--HG--
branch : trunks