This change might (might) be better off as a separate commit.