Never mind, I am going to find a better way to refactor this stuff

This reverts commit 0ce2ec981a0ee3e6a8b232445f1d29b10abe1763.