Fix build after last commit on < 5.10.x