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

This reverts commit f2c030a0fd2e0be9c41d7c6605912c925785d0c3.

Reason for revert: Shouldn't be backported

Change-Id: Id2f6c05c19c7840ef54b65cd3dc7eccef17e864e
2 files changed