This reverts commit f52138de. It was the cause
of infinite recursive loops (huh, why, that was obvious!).