Patch 4

Strip down BlockOilFlowing and BlockOilStationary to use only the required stuff if Krapht's Forge PR is merged.