Revert back wrong change, after experiments with null destination