Undo the issue #99 fixes