refs #4357 this should fix some integration tests but not sure about the side effects