Reset Fields
Revert "Reset Fields"

This reverts commit f57b60efab0548faf3a42c1efa2fd4cd162f3c06.