Lost changes from 5.2.2-11-gb79f6cc