2792 No earthly reason to keep the logic in the share file itself now