This reverts on change of #35 which turned out to be the wrong way to address the problem.