Reverting r91756 per CR and bug 26470