Revert "Mixed issues with forcefields."

This reverts commit 0a85d16ab65fea19a7936eede1ee44b228ef239f.