Bring Back Common Sense 8098

Performance and Progress 7944