Revert "Merge pull request #281 from MartinGijsen/master"

This reverts commit 3a943a81fd18eb7113ebb5fa4cd82aa8f624b11b, reversing
changes made to 8222ce91ba0d46fdd818836d73a79afdd58cc3f3.
Merge branch 'fit-revert': reverts Fit changes from #281.

Fixes #359.