Fixes #19. Reverts incorrect part of 1a84ac4.