I just did this in a separate commit: 8262ce64a2fdd0227f30e6ef25cf1f7d099cb807