I should have searched further before posting this question. It is answered here by dmertz:
https://ttlc.intuit.com/community/tax-credits-deductions/discussion/re-qualified-charitable-distribu...
Solution worked perfectly for me!
