Bring this to be in par with recent changes to the core