Will leave this alone for now, don't want to change behavior in this PR.