Rolled back mistaken bugfix

This rolls back the problem mentioned in issue #19.