Fix short reloads

This follows the approach of #10182 but avoids the problems it encountered with a few checks.
Fixes #10014