This reverts commit 1a9f0fc184. 0.9.3 does not work correctly... revert this until the issue is found.
1a9f0fc184