Removed temporary fix for #117. Further discussion needed.