diff -u b/core/lib/Drupal/Core/Entity/EntityHandlerBase.php b/core/lib/Drupal/Core/Entity/EntityHandlerBase.php
--- b/core/lib/Drupal/Core/Entity/EntityHandlerBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityHandlerBase.php
@@ -13,9 +13,10 @@
 
 /**
  * Provides a base class for entity handlers.
- 
- * @deprecated for 9.x.
- * @todo Deprecate this in https://www.drupal.org/node/2471663.
+ *
+ * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ *
+ * @see \Drupal\Core\Entity\EntityHandlerInterface
  */
 abstract class EntityHandlerBase {
   use StringTranslationTrait;