refs #9257. Starting to fix integration.