I've had this change sitting in a different branch for months.