Refs #8385 Undo commit to fix build servers for now.