Revert "UnderscoresSucks"

This reverts commit 103e7e58d3117be72fcf9448ca5cd1ba361afd40.