Work around 2.7.0 deficencies (Fixes #4223)