Revert deprecated code in Metric