should be its own commit? I don't see an explanation of this change