Split hashar's patchset2 into its own commit