We should make sure this doesn't break with one-track releases.