Bring Back Common Sense 1617

Change with Stability 1352