Revert "respect the underscore"

This reverts commit 2932938666277ed43e897deb26a82fc385d5af8d.