Has this been submitted upstream? Please apply conditionally only to Mavericks.