7/19 hotfix attempt 2

Something went very wrong with the last patch attempt, sorry!