Revert "Fixing Crap"

This reverts commit e32df8cce8911a72f479ef4269507db5bed7ce60.