Reverting r76017 per discussion on Bugzilla. Lack of community consensus for change...