Reverted r40719, plainly flawed, for instance the hard-coded references to index...