Revert fix for #85. 

This bugs seems to be occured only in 1.3.3