Revert "Leftovers from previous commit"

This reverts commit 8a5bf9e1938491166759b85b262de45f29066ea0.