See rP3f8eccdaec8f85933bfea6ce5348bde25ced0489.
Read carefully.
This is a change I can stand behind. Looks good!