Just to be safe I only use water quenches on "W" series steels.
Everything else I use oil.