Should this be moved to deprecated.php?