Try to match change made in master in 070eb954f4