Reverts the unintended water bucket interaction fix (MC-127110) to restore the old waterlogging behavior, with configurable control.
Ported to newer version.
