Revert "Remove metrics now to avoid issues later on. TODO: Make own metrics."

This reverts commit 00dea91d6407b14a5b2515226d99a685625699d1.