Revert "Fixes #788 - For adding sub collection items via a lookup you cannot always trust the type value from the submitted EntityForm"

This reverts commit ba186a19d846da7d02765249dd7ed0fa7241bb15.
(cherry picked from commit 388d6e86e56fa0448a51d5519164ac4a5bb894f1) to
the 3.0 line to fix #788