this is a backport of the 70X committed in #93