Can we split this into a separate commit just for clean history?