Reapply bugfix to snuownd.