Reverted to removing v7 support library