Refs #9990. Cleaning up.