Refs #10061 attempting again to fix build errors