Revert "Integrated E711"

This reverts commit 85477175c10bd76ed15ad607c6c8c9626772b35c.
This commit no longer needed in Production