revert some changes
Merge pull request #161 from haraldpdl/optimizations

revert some changes