ok. let's try to land 4173 this week, either way