Re-apply part fix of 4e2c016