Reverting changes for #20. There is better fix now.