r6229: Back out these changes ...