Yes I think if we modify it in `push_file` then we'll make the need for this obsolete