Revert "No need for this anymore"

This reverts commit 20b391bc8e7b0ff7786203c135524f591ea3b106.