(cherry picked from commit c696944d36) Co-authored-by: Will Hickey <will.hickey@solana.com>
c696944d36