Revert from 2.10.x to v2.10.4

Another attempt to get paradise-210 working again.