Reversing the pull request by Joel Simson to fix the bug