Remove buggy chunk of code, refs #2312, refs #2305