diff --git a/core/lib/Drupal/Core/Entity/EntityAccessController.php b/core/lib/Drupal/Core/Entity/EntityAccessController.php
index 423281f..1fbce68 100644
--- a/core/lib/Drupal/Core/Entity/EntityAccessController.php
+++ b/core/lib/Drupal/Core/Entity/EntityAccessController.php
@@ -94,6 +94,10 @@ protected function access(EntityInterface $entity, $operation, $langcode = LANGU
       $account = user_load($GLOBALS['user']->uid);
     }
 
+    if ($account instanceof User) {
+      $account = $account->getBCEntity();
+    }
+
     // We grant access to the entity if both of these conditions are met:
     // - No modules say to deny access.
     // - At least one module says to grant access.
diff --git a/core/modules/node/tests/modules/node_access_test/node_access_test.module b/core/modules/node/tests/modules/node_access_test/node_access_test.module
index 38ee65c..66c6b59 100644
--- a/core/modules/node/tests/modules/node_access_test/node_access_test.module
+++ b/core/modules/node/tests/modules/node_access_test/node_access_test.module
@@ -17,13 +17,13 @@
 function node_access_test_node_grants($account, $op) {
   $grants = array();
   // First grant a grant to the author for own content.
-  $grants['node_access_test_author'] = array($account->id());
+  $grants['node_access_test_author'] = array($account->uid);
   if ($op == 'view' && user_access('node test view', $account)) {
     $grants['node_access_test'] = array(8888, 8889);
   }
 
   $no_access_uid = state()->get('node_access_test.no_access_uid') ?: 0;
-  if ($op == 'view' && $account->id() == $no_access_uid) {
+  if ($op == 'view' && $account->uid == $no_access_uid) {
     $grants['node_access_all'] = array(0);
   }
   return $grants;
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 93bf344..4fc06f7 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2609,8 +2609,6 @@ function system_form_user_register_form_alter(&$form, &$form_state) {
  */
 function system_user_presave($account) {
   $config = config('system.timezone');
-  debug(get_class($account));
-  debug(print_r($account->timezone, TRUE));
   if ($config->get('user.configurable') && empty($account->timezone) && !$config->get('user.default')) {
     $account->timezone = $config->get('default');
   }