I should have another merge to consider later today anyway, so I will test it
then. In the meantime, I've commented out the workarounds so that I'll get a
reminder. :-)