diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 160a52a1bf..9c9e32b57c 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -907,9 +907,8 @@ class acp_board
 		global $template, $user;
 
 		$timezone_select = phpbb_timezone_select($template, $user, $value, true);
-		$timezone_select['tz_select'];
 
-		return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select['tz_select'] . '</select>';
+		return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select . '</select>';
 	}
 
 	/**
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index c9239e534a..31b033604d 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1661,7 +1661,7 @@ class acp_users
 					${'s_sort_' . $sort_option . '_dir'} .= '</select>';
 				}
 
-				$timezone_selects = phpbb_timezone_select($template, $user, $data['tz'], true);
+				phpbb_timezone_select($template, $user, $data['tz'], true);
 				$user_prefs_data = array(
 					'S_PREFS'			=> true,
 					'S_JABBER_DISABLED'	=> ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true,
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d280ab0f37..4cb4170ac6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1132,9 +1132,7 @@ function phpbb_timezone_select($template, $user, $default = '', $truncate = fals
 	}
 	$tz_select .= '</optgroup>';
 
-	return array(
-		'tz_select'		=> $tz_select,
-	);
+	return $tz_select;
 }
 
 // Functions handling topic/post tracking/marking
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 6db23d9f65..ea092c83bc 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -135,8 +135,7 @@ function tz_select($default = '', $truncate = false)
 {
 	global $template, $user;
 
-	$timezone_select = phpbb_timezone_select($template, $user, $default, $truncate);
-	return $timezone_select['tz_select'];
+	return phpbb_timezone_select($template, $user, $default, $truncate);
 }
 
 /**
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 6486ca9438..2195500b57 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -154,7 +154,7 @@ class ucp_prefs
 				}
 				$dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>';
 
-				$timezone_selects = phpbb_timezone_select($template, $user, $data['tz'], true);
+				phpbb_timezone_select($template, $user, $data['tz'], true);
 
 				// check if there are any user-selectable languages
 				$sql = 'SELECT COUNT(lang_id) as languages_count