Merge "annoyatron: temp fix"