Re-apply compatibility fix from 42504b8af5a0bf7f012e6c40668659ca45fd4e22, it was...