I think we might need to go back and fix this code anyway, because this was broken during our bug bash.