This should fix ATEAM-901 that's reported by @elmsheus (a quick cross check would be much appreciated). Let me run full integration tests to make sure this doesn't break anything else.