Bring Back Common Sense 1702

Change with Stability 1481