Nuke shit I added in 4d7b2dd that shouldn't come until v4

BS3 commits: a2f08158d032c1025ca0c6bf411b8282b606fb7b