This reverts commit 4672cd360f00880c38e91a3c2bdce84bcd876cec. Fixes #34 (cherry picked from commit 954f40e550ba753a52acaca7c0857cbfd55e982f)