diff --git a/global_config.ini b/global_config.ini
index 9b4b139..580b090 100644
--- a/global_config.ini
+++ b/global_config.ini
@@ -182,9 +182,7 @@
 # the "Sentry Switched CDU" type
 rpm_sentry_username: fake_user
 rpm_sentry_password: fake_password
-# TODO(fdeng): crbug.com/364323. Change it back to
-# http://chromeos-rpmserver1.cbf.corp.google.com:9999 once the bug was fixed.
-rpm_frontend_uri: http://chromeos-devserver1.mtv.corp.google.com:9999
+rpm_frontend_uri: http://chromeos-rpmserver1.cbf.corp.google.com:9999
 rpm_recovery_boards: stumpy,kiev
 
 # Path the devserver source tree, used for spawning devserver from autoserv in