revert to support-v4 version r7