Further tracking down 2.4 changes.