undoing "fix" for issue/28#comment-53513356