Revert "This casues things to be duplicated, apparently"

This reverts commit a7194d0b2fc00d7605ee4452d1573c9ca120e181.