Revert "Metrics be dead"

This reverts commit 0a9fd4a92e51f82899037af7e045a5269f39da8d.