Revert from 2.10.x to v2.10.4

Another attempt to get paradise-210 working again.
Merge pull request #46 from retronym/topic/paradise-fix-2

Revert from 2.10.x to v2.10.4