Revert "Leftovers"

This reverts commit e757b5216a0e5754aa86aa53ab661ffbac30fbc7.