Update to 4e90d1f from source