Merge pull request #87 from alexander-zimmermann/next

Revert patch 8deded9adf