Fix issue 12859 again

The direct pushing by Andrew Edwards had accidentally reverted regression fix.