Revert "Bad Code, Will Revert"

This reverts commit 778bcf1877044f625f2fce840ec9e57aaa8f2ad0.