Reverted Change from fb823e8

... resulted in other problems, see issue #1