Reverted changes from commit 7e9f8d84bf. Fixes #18