Restored the old code. New code on branch.