Fixing DEVELOPER-677 (which mini buzz to title)

I'm not sure I like this as much, but this is what Mark wanted.