Revert "Fix incompatible units bug when working with border-box fluid grids"

This reverts commit b198bad29d11ddacdaaa2752a0b8b405612b3196.