Revert "Updated"

Because there were bad merges. BAD.