Revert "i'll merge your field"

This reverts commit 37dd7b05923de0ac05cc778bb9b7a4ec7b03e775.