RFC/PATCH: avoid metafilevirus problems