refs #8614 Dealing with consequences of ill defined merge

Some code pieces came not valid