Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.

Previously skipped admin_watermarks mods to use new functionality of #1945
since there was concurrent work on it with #1970.
Now that both are done, we can wrap this up.