As discussed elsewhere, we should come up with a better solution to this long-term