Since this is merged, can we mark this as fixed?