@mcginty is this code path still active?