Revert "Add support for fields starting with underscore"

This reverts commit 061016fbbaa87776520d00d17df56d7884d00ed2.
Add support for fields starting with underscore