r11022: revert incorrect stuff from clisp testing