Imspector fix for Back Button
Revert "Imspector fix for Back Button"

This reverts commit 9fab0b2aeb362c5b06b64c8f0e85356f97250836.
Revert "Revert "Imspector fix for Back Button""

This reverts commit 42e8df2d65d6441560c189741550ed7357cfcf69.