Bring Back Common Sense 6152

Stability for the Next Generation 5571