Can you please update git with your changes? Preferrably with the logical changes separated over one import commit.