This reverts commit 4672cd360f. Fixes #34 (cherry picked from commit 954f40e550)
4672cd360f
954f40e550