Revert "Some changed to fluids. This is NOT A3.1 that has some lines commented out."

This reverts commit 9fe844b661347b5b5cd54150636f90257406e860.
Oops: NOT A3.1 simply a hotfix as well as some fluid changes.