Bring Back Common Sense 3183

Performance and Progress 3123