RR: removed some hacks used for diagnosis.
Forget what the problem was.