Very prescient commit message, that last one