Bring Back Common Sense 8435

Performance and Progress 8279