refs #5007 change how we handle this to be in sync with future core