Ok, I went ahead and put in an infrastructure bug...