#24925 Now handles non-project entities correctly.