Remove dependency to support-v7