PR18777: This PR is already fixed; add regtest.