Reverting last commit that "fixed" bug 87971. The bug was not valid