refs #6287 adjust how we fix this to be in sync with future core