This accidentally reverts the earlier fix #5233.