Bring Back Common Sense 2249

Performance and Progress 2231