Revert Again to old 0.7.x