Work in progress to restore the version that works.