Revert "Should fix issue #160"

This reverts commit 2e8fb2a953a4b4a1c673535c0b82047765d944a6.
Revert "Revert "Should fix issue #160""

This reverts commit 3d2119dbfa985ea1161774bec0c90d3af785662e.
Revert "Revert "Revert "Should fix issue #160"""

This reverts commit 1499b9c7f37306fc315c3a60f92ad30d96c580c6.
Revert "Revert "Revert "Revert "Should fix issue #160""""

This reverts commit be3d1593f5a2a18e26bcf8dd8ef9d31512524746.