Revert "This might be more performant in some cases"

This reverts commit 105ba3876527f3346574cd2e00d090b95396b3fe.