Revert 25b355ea6b2c9b61203fdb94dace4ecfd5bfa85f and b1b2bc43550ad6f2091f85115da4fa7e6f42eed1 as issue was fixed upstream
Fix bad merge. Use float precision for text width calculation. Fixes some missing text introduced in recent commits