I'm fine with this change, but I wonder if it should be a separate commit so it becomes easier to read through the history and see what changed.