diff --git a/debian/control b/debian/control
index 81e9b69730..e29a95eaed 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,6 @@ Package: gitlab
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
-# workaround for broken libjs-jquery-atwho #890391
- wget,
  lsb-base (>= 3.0-6),
  git (>= 1:2.7.3~),
  rake,
diff --git a/debian/gitlab.links b/debian/gitlab.links
index 06feda180f..21748a0627 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -18,7 +18,7 @@ usr/share/javascript/pdf/build/pdf.worker.js usr/share/gitlab/vendor/assets/java
 usr/share/javascript/pdf/build/pdf.js usr/share/gitlab/vendor/assets/javascripts/pdf.js
 usr/share/javascript/pdf/build/pdf.js usr/share/gitlab/vendor/assets/javascripts/pdf.min.js
 usr/share/javascript/caret.js/jquery.caret.js usr/share/gitlab/vendor/assets/javascripts/jquery.caret.js
-usr/share/gitlab/node_modules/at.js/dist/js/jquery.atwho.js usr/share/gitlab/vendor/assets/javascripts/jquery.atwho.js
+usr/share/javascript/jquery-atwho/jquery.atwho.js usr/share/gitlab/vendor/assets/javascripts/jquery.atwho.js
 usr/share/javascript/jquery-nicescroll/jquery.nicescroll.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.nicescroll.min.js
 usr/share/javascript/clipboard/clipboard.js usr/share/gitlab/vendor/assets/javascripts/clipboard.js
 usr/share/javascript/chartjs/Chart.js usr/share/gitlab/vendor/assets/javascripts/chart-lib.min.js
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index d22734f529..c996916d81 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -30,20 +30,16 @@ chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
 
 echo "Installing node modules..."
 runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/node_modules'
-runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/jquery'
 runuser -u ${gitlab_user} -- sh -c 'npm install npm'
 runuser -u ${gitlab_user} -- sh -c 'node_modules/.bin/npm install'
-runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/jquery'
-# workaround for broken libjs-jquery-atwho #890391
-# npm i at.js won't work as it needs jquery@^1.7.0 as peer dependency
-runuser -u ${gitlab_user} -- sh -c 'wget  -O /tmp/at.js.tar.gz `npm view at.js dist.tarball`'
-runuser -u ${gitlab_user} -- sh -c 'tar -C node_modules --transform "s/package/at.js/" -zxf /tmp/at.js.tar.gz'
 runuser -u ${gitlab_user} -- sh -c 'npm i document-register-element@1.3.0'
-echo "Precompiling locales..."
-runuser -u ${gitlab_user} -- sh -c 'bundle exec rake gettext:po_to_json'
+
 echo "Webpacking..."
 runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/webpack'
 runuser -u ${gitlab_user} -- sh -c 'NODE_PATH=/usr/share/gitlab/node_modules webpack --config config/webpack.config.js'
 
 echo "Precompiling assets..."
 runuser -u ${gitlab_user} -- sh -c 'bundle exec rake tmp:cache:clear assets:precompile'
+
+echo "Precompiling locales..."
+runuser -u ${gitlab_user} -- sh -c 'bundle exec rake gettext:po_to_json'