Revert commit 1e6584e9e62f255d63a9a8cac686914735c193ed: this was actually needed for preserving fields order