Revert "FIXED COLLISION F**YEAHHHH"

This reverts commit 74b661545811fcb99a4da17325a0b734e17eecde.