Revert "Bug 907951 - [System] replace forward images of wrapper"

This reverts commit 86163ce443e3a5b5093c6143f8646df54b658ec5.
Merge branch 'v1-train' into v1.1.0hd