Use a simpler, previous fix to support gnumeric 1.12.43.

This reverts both 344ae4d6 and
ef5ae496. The mess was caused by me not
actually pushing my change causing duplicated work by Mattia. Mea culpa...