In the closed PR which became this branch :)