Revert "Reverted back to old donation process"

This reverts commit d135cded5676d973947d07dd1fb528870c2cdf1f.
13 files changed