r11612: calling this pre2 after consulting with Jeremy