Revert "Merge pull request #1 from seralf/scala-version"

This reverts commit a7d4a9b0048e5376beeaab186dfe6c29d865ec1e, reversing
changes made to 5978baf8be386c62e36e4299013789d62ed8e4c7.
Merge pull request #2 from fhopf/revert_pull

Revert "Merge pull request #1 from seralf/scala-version"