Revert "Ensure scope 'this' is properly restored, add unit test."

This reverts commit f59e2c826237e1651f102e32200c84cdbf414e4d.

Only reverted in 3.5.x to proceed with performance testing