* The simple solution * The better solution * Revert "The better solution" This reverts commit 611e56e031636734abab1ad3e77bf88b69a4de13.
A lot of BUIs aren't going to handle the state coming in cleanly but we can fix em as we find em.