Reverted some dumbass changes