It seems fine to me, but that's orthogonal to this commit. This logical branch is just a rearranged version of [what was already here](https://github.com/mozilla/zamboni/pull/1071/files#L3L164).