The last work (hopefully) for bug #7376.