Revert "Donor scaffold"

This reverts commit db492d3ca01bbd1e5b0c9c5fe88248d44e3fb84a.