Move to a slight variation of the old code again, since the new one
had some serious problems.