[BUGFIX] Revert abusive deprecation