My water pump went out on my 84 Toyota 4Runner. The 8184 and 8595 22r/re water pump procedures should be the same.