Fluid collisions modify hitbox

Steps to Reproduce:
1. Stand half above fluid, half below fluid (Fluid: lava, water)

2. Highlight a block
Observed Results:
Hitbox is incorrect, highlighted block is wrong
Expected Results:
Hitbox is correct, highlighted block is where crosshairs are.