Revert "Unused atm"

This reverts commit 21b04b23f4e5c99a133b095540f51a610bbaf8e2.