Refs #9410 remove temporary changes