Actually fix the problem from previous merge

This hunk is also critically needed.