Revert to Dennis Lubert's patch rather than my "fixes"