diff --git a/admin/auth_config.php b/admin/auth_config.php
index 1fe945bef58..b307cd7d5d9 100644
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -64,8 +64,6 @@ echo "<form id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
 echo "<div>\n";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n";
 echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
-// HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-echo prevent_form_autofill_password();
 
 // auth plugin description
 echo $OUTPUT->box_start();
diff --git a/admin/templates/settings.mustache b/admin/templates/settings.mustache
index aba66012463..4f351b8d2c4 100644
--- a/admin/templates/settings.mustache
+++ b/admin/templates/settings.mustache
@@ -43,7 +43,6 @@
         {{/params}}
         <input type="hidden" name="sesskey" value="{{sesskey}}">
         <input type="hidden" name="return" value="{{return}}">
-        {{>core/prevent_form_autofill_password}}
         {{#title}}
             <h2>{{title}}</h2>
         {{/title}}
diff --git a/admin/templates/settings_search_results.mustache b/admin/templates/settings_search_results.mustache
index dd392f7c940..c6f7bbb3bb5 100644
--- a/admin/templates/settings_search_results.mustache
+++ b/admin/templates/settings_search_results.mustache
@@ -37,7 +37,6 @@
 <form action="{{actionurl}}" method="post" id="adminsettings">
     <div>
         <input type="hidden" name="sesskey" value="{{sesskey}}">
-        {{>core/prevent_form_autofill_password}}
     </div>
     <fieldset>
         <div class="clearer"></div>
diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php
index f4aa61713c9..38a8f065ba1 100644
--- a/admin/upgradesettings.php
+++ b/admin/upgradesettings.php
@@ -63,8 +63,6 @@ echo '<form action="upgradesettings.php" method="post" id="adminsettings">';
 echo '<div>';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 echo '<input type="hidden" name="return" value="'.$return.'" />';
-// HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-echo prevent_form_autofill_password();
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';
 echo $newsettingshtml;
diff --git a/files/renderer.php b/files/renderer.php
index 7fce28428ea..46324fcd64e 100644
--- a/files/renderer.php
+++ b/files/renderer.php
@@ -1016,8 +1016,6 @@ class core_files_renderer extends plugin_renderer_base {
 
                     <div class="controls"><select></select></div>
                 </div>';
-        // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-        $rv .= prevent_form_autofill_password();
         $rv .= '
                 <div class="fp-login-input control-group clearfix">
                     <label class="control-label"></label>
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 01bd4caf5ad..93d360c1636 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -5620,6 +5620,7 @@ function message_is_user_blocked($recipient, $sender = null) {
 }
 
 /**
+<<<<<<< 919b9dfabd69f71c088f565746c547e6e169a0b7
  * Display logs.
  *
  * @deprecated since 3.2
@@ -6369,5 +6370,15 @@ function get_logs($select, array $params=null, $order='l.time DESC', $limitfrom=
            $select
             $order";
 
-    return $DB->get_records_sql($sql, $params, $limitfrom, $limitnum) ;
+    return $DB->get_records_sql($sql, $params, $limitfrom, $limitnum);
+}
+
+/**
+ * Renders a hidden password field so that browsers won't incorrectly autofill password fields with the user's password.
+ *
+ * @deprecated since Moodle 3.2 MDL-53048
+ */
+function prevent_form_autofill_password() {
+    debugging('prevent_form_autofill_password has been deprecated and is no longer in use.', DEBUG_DEVELOPER);
+    return '';
 }
diff --git a/lib/formslib.php b/lib/formslib.php
index adb76dd7f32..282ebbee0fe 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -2750,8 +2750,6 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
         $this->_collapseButtons = '';
         $formid = $form->getAttribute('id');
         parent::startForm($form);
-        // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-        $this->_hiddenHtml .= prevent_form_autofill_password();
         if ($form->isFrozen()){
             $this->_formTemplate = "\n<div class=\"mform frozen\">\n{content}\n</div>";
         } else {
diff --git a/lib/templates/prevent_form_autofill_password.mustache b/lib/templates/prevent_form_autofill_password.mustache
deleted file mode 100644
index 307a0e4ac75..00000000000
--- a/lib/templates/prevent_form_autofill_password.mustache
+++ /dev/null
@@ -1,23 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    Snippet to prevent browsers from autofilling password fields.
-}}
-<div class="hide">
-    <input type="text" class="ignoredirty" />
-    <input type="password" class="ignoredirty" />
-</div>
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 6c71317f254..fed4655ef32 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -37,6 +37,7 @@ information provided here is intended especially for developers.
   - get_logs()            - See MDL-43681 for more information
   - get_logs_usercourse() - See MDL-43681 for more information
   - get_logs_userday()    - See MDL-43681 for more information
+  - prevent_form_autofill_password() Please do not use anymore.
 * The password_compat library was removed as it is no longer required.
 * Phpunit has been upgraded to 5.4.x and following has been deprecated and is not used any more:
   - setExpectedException(), use @expectedException or $this->expectException() and $this->expectExceptionMessage()
diff --git a/lib/weblib.php b/lib/weblib.php
index 74ec6af67cb..75a227c7bf1 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3556,14 +3556,3 @@ function get_formatted_help_string($identifier, $component, $ajax = false, $a =
     }
     return $data;
 }
-
-/**
- * Renders a hidden password field so that browsers won't incorrectly autofill password fields with the user's password.
- *
- * @since 3.0
- * @return string HTML to prevent password autofill
- */
-function prevent_form_autofill_password() {
-    global $OUTPUT;
-    return $OUTPUT->render_from_template('core/prevent_form_autofill_password', []);
-}
diff --git a/repository/filepicker.php b/repository/filepicker.php
index e488e3d4d41..4ce0236020a 100644
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -272,8 +272,6 @@ case 'sign':
         echo '<form method="post">';
         echo '<input type="hidden" name="action" value="sign" />';
         echo '<input type="hidden" name="repo_id" value="'.s($repo_id).'" />';
-        // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-        echo prevent_form_autofill_password();
         $repo->print_login();
         echo '</form>';
     }
diff --git a/theme/boost/classes/output/core/files_renderer.php b/theme/boost/classes/output/core/files_renderer.php
index 50257d9d3fc..66d2e826bda 100644
--- a/theme/boost/classes/output/core/files_renderer.php
+++ b/theme/boost/classes/output/core/files_renderer.php
@@ -107,7 +107,7 @@ class files_renderer extends \core_files_renderer {
      * @return string
      */
     protected function fp_js_template_loginform() {
-        return $this->render_from_template('core/filemanager_loginform', ['autofillhack' => prevent_form_autofill_password()]);
+        return $this->render_from_template('core/filemanager_loginform', []);
     }
 
     /**
diff --git a/theme/boost/templates/core/filemanager_loginform.mustache b/theme/boost/templates/core/filemanager_loginform.mustache
index 5de0b3fc60e..e3c67cb9baf 100644
--- a/theme/boost/templates/core/filemanager_loginform.mustache
+++ b/theme/boost/templates/core/filemanager_loginform.mustache
@@ -14,7 +14,6 @@
                     <label class="form-control-label"></label>
                     <select class="form-control"></select>
                 </div>
-                {{{autofillhack}}}
                 <div class="fp-login-input form-group">
                     <label class="form-control-label"></label>
                     <input class="form-control"/>
@@ -27,4 +26,4 @@
             <p class="mdl-align"><button class="fp-login-submit btn-primary btn">{{#str}}submit, repository{{/str}}</button></p>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/theme/boost/templates/core_admin/settings.mustache b/theme/boost/templates/core_admin/settings.mustache
index e971f03d3ce..1de92506222 100644
--- a/theme/boost/templates/core_admin/settings.mustache
+++ b/theme/boost/templates/core_admin/settings.mustache
@@ -24,7 +24,6 @@
         {{/params}}
         <input type="hidden" name="sesskey" value="{{sesskey}}">
         <input type="hidden" name="return" value="{{return}}">
-        {{>core/prevent_form_autofill_password}}
         {{#title}}
             <h2>{{title}}</h2>
         {{/title}}
diff --git a/theme/boost/templates/core_admin/settings_search_results.mustache b/theme/boost/templates/core_admin/settings_search_results.mustache
index ce09da88c75..d5f0bc15a50 100644
--- a/theme/boost/templates/core_admin/settings_search_results.mustache
+++ b/theme/boost/templates/core_admin/settings_search_results.mustache
@@ -20,7 +20,6 @@
 <form action="{{actionurl}}" method="post" id="adminsettings">
     <div>
         <input type="hidden" name="sesskey" value="{{sesskey}}">
-        {{>core/prevent_form_autofill_password}}
     </div>
     <fieldset>
         <div class="clearer"></div>