Buggy cruft from original implementation.