Did we backport this bugfix for Grizzly? We're not on Havana, so we must have backported it or it was backported to Grizzly Stable by the upstream maintainers.

Also not allowing underscore is quite weird