Bring Back Common Sense 77805

Change with Stability 73693