diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
index 03cf680..827e31b 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
@@ -68,7 +68,7 @@ protected function textFormatHasTransformationFilters($format_id) {
    * Implements \Drupal\edit\EditPluginInterface::getAttachments().
    */
   public function getAttachments() {
-    $user_format_ids = array_keys(filter_formats(\Drupal::request()->attributes->get('_account')));
+    $user_format_ids = array_keys(filter_formats(\Drupal::currentUser()));
     $manager = \Drupal::service('plugin.manager.editor');
     $definitions = $manager->getDefinitions();
 
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index e68e1b2..6000391 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -170,8 +170,7 @@ function filter_permission() {
 
   // Generate permissions for each text format. Warn the administrator that any
   // of them are potentially unsafe.
-  $account = Drupal::request()->attributes->get('_account') ?: $GLOBALS['user'];
-  $administer_filters = $account->hasPermission('administer filters');
+  $administer_filters = Drupal::currentUser()->hasPermission('administer filters');
   foreach (filter_formats() as $format) {
     $permission = $format->getPermissionName();
     if (!empty($permission)) {
@@ -313,7 +312,7 @@ function filter_get_formats_by_role($rid) {
  */
 function filter_default_format(AccountInterface $account = NULL) {
   if (!isset($account)) {
-    $account = Drupal::request()->attributes->get('_account');
+    $account = Drupal::currentUser();
   }
   // Get a list of formats for this user, ordered by weight. The first one
   // available is the user's default format.
@@ -729,12 +728,12 @@ function filter_process_format($element) {
   );
 
   // Get a list of formats that the current user has access to.
-  $account = Drupal::request()->attributes->get('_account');
-  $formats = filter_formats($account);
+  $user = Drupal::currentUser();
+  $formats = filter_formats($user);
 
   // Use the default format for this user if none was selected.
   if (!isset($element['#format'])) {
-    $element['#format'] = filter_default_format($account);
+    $element['#format'] = filter_default_format($user);
   }
 
   // If multiple text formats are available, remove the fallback. The
@@ -880,7 +879,7 @@ function theme_text_format_wrapper($variables) {
  *   - id: Filter ID.
  */
 function _filter_tips($format_id, $long = FALSE) {
-  $formats = filter_formats(Drupal::request()->attributes->get('_account'));
+  $formats = filter_formats(Drupal::currentUser());
 
   $tips = array();