diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index c960f1b800..f23f6ea3a9 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -66,8 +66,6 @@ class openstack_project::review_dev (
     github_oauth_token              => $github_oauth_token,
     github_project_username         => $github_project_username,
     github_project_password         => $github_project_password,
-    trivial_rebase_role_id          =>
-      'trivial-rebase@review-dev.openstack.org',
     mysql_password                  => $mysql_password,
     email_private_key               => $email_private_key,
     sysadmins                       => $sysadmins,
diff --git a/modules/openstack_project/templates/gerrit_patchset-created.erb b/modules/openstack_project/templates/gerrit_patchset-created.erb
index 1f35a12577..27fcab949d 100755
--- a/modules/openstack_project/templates/gerrit_patchset-created.erb
+++ b/modules/openstack_project/templates/gerrit_patchset-created.erb
@@ -4,11 +4,13 @@
 timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@"
 timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@"
 timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org'
+<% if trivial_rebase_role_id -%>
 timeout -k 2m 10m /usr/local/bin/trivial-rebase \
     patchset-created \
     --whitespace \
     --private-key-path=<%= ssh_host_key %> \
     --role-user=<%= trivial_rebase_role_id %> "$@"
+<% end -%>
 <% if $ssh_welcome_rsa_key_contents != "" -%>
 timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created --dryrun \
     --verbose welcome-message@review.openstack.org \