Re-rolled patch #44, tried fixing cs errors.