Reversing the pull request by Joel Simson to fix the bug
Bringing in the explorer updates