Get your taxes done using TurboTax

The custodian normally asks only for the amount of contribution to be returned (not for the adjusted amount to be distributed) and performs the transaction after the close of the market, doing the NIA calculation for you when processing your request.  If the custodian does not take this responsibility, yes, that does create the  complication that you describe.