Revert template builder changed