Because this deserves two commits!