Properly fix bug 68206

The issue itself and the issue with the previous fix have ben fixed.
I cannot identify other issues this may have caused; time will tell.