Fix broken merge. Refs #8126.

- I had a problem with code being on develop that shouldn't have been. As a quick fix I have indented the related method in order to overwrite all changes.