Work around rolify bug