Revert "Make field list order consistent"

This reverts commit 743c7acfd2e77b2d55bb8fe688651090795e0cb5.