Reverting some changes from commit: e104fae6dd9751aed864c8ee65e3273ff13b2acf (smarty tags unification)