Working around an evil bug that is in a beta OS not to be named right now but should be gone before September.