Fix for #1555 increasing timeout

@Kartones I've tripled up to what we spoke, since this is obviously safe I'll merge & deploy after your CR in spite of the CI server, if you think the same.