Could you please add a note to the second commit explaining why exactly it's needed? -- (