I've waited 2 years for this commit