Revert commit ae80e7dfbdbdf46d9b604766ab6a77e0a60442df until cause of issue #15 is found.
Revert commit 7ae816d4433bb32ee742c53dd77416dfa14a34c8 until cause of issue #15 is found.