Revert.
  Comment out code to stop segfaults.

  Not a real solution but it makes things useable.

  Updates #95.