Revert "Revert "Pretty good change""

This reverts commit 6c217633246efbd5c14e38e1d3a87f8e1c8d362c.