[WIP] Squash me with the previous commit next week.