Revert "Adding a fix for trimming any large fields before they are inserted into"

This reverts commit 4480a86810cc73a198fbe967685dd8980b375887.

Reason for revert: Change shouldn't be backported

Change-Id: I50efa4b0f7f897befef64d159f7de61721c6dad3
2 files changed