Removes overzealous optimization.  Fixes #59.